Merge "Support AOD => occluded and Dozing => occluded transitions" into udc-qpr-dev