Merge changes from topic "direct_uid_idle" into rvc-dev am: 283bb20921

Change-Id: Iddc0dda26167288a7defc4545862c706d0209e27