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

Change-Id: I3574385d16f6d1fea79d57b17c866ea7cc9903fb