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

Change-Id: If13b6a841e5c01a90ab182d438b35fb9ed127503