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

Change-Id: Ia9d60b28c0a4f07059069811e81bc547b824b592