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

Change-Id: I60180d16ea0ab2cbe96c652eb318be9922e8acb7