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

Change-Id: I161efd5a2921ce677c3feadb665b153740aa0342