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

Change-Id: I5fdfce3b26de403015e4888daf6696febe5e2f7a