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

Change-Id: I863dc17790f62b8709a3ffcc18a40b9dc17b35e3