Merge "Populate uniq field in uhid." into rvc-dev am: 5291e518 am: 18ec01f4 am: 1066088d am: a15beef8 Change-Id: I266b45d83682c4d04b033686e05a24c0794c8c08