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

Change-Id: I91797e4b4d3df14f1113b469b4582b099120f555