Merge changes from topic "tej-uid" into rvc-dev am: 0ac1c345a4 am: d4b44af54d

Change-Id: I75321a8cf5ad8409dc98385a8e249924fd54babc