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

Change-Id: I764b33d08157eb9aa4c3ca2e1df1e3bde6e05283