Merge "Populate uniq field in uhid." into rvc-dev am: 5291e518a4 am: 18ec01f497 am: 52701c9fe0

Change-Id: I134d43396ac0bb813d2b760a664131eaeb748042