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

Change-Id: I6b5fd6eb532cb5cb83a6547d6364b6db103d67a5