Merge changes from topic "direct_uid_idle" into rvc-dev am: 283bb20921 am: d729c50f8b am: 07a230899a am: ca96aee3a2

Change-Id: I9f008d2b61795d8de451e3afd241a70f94d1b064