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

Change-Id: I92bb5615066a9dd1fcb7a27bb7f3f82c46e83c3f