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

Change-Id: If96e24f8ff775948bce5557cefb779d7ca0e7ae1