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

Change-Id: Iae442ada6910c4c93c90f6792ebd9cbfb4750fab