Merge "Populate uniq field in uhid." into rvc-dev am: 5291e518 am: 18ec01f4 am: 52701c9f am: 24b6a65a Change-Id: I8a029f08dade676899d826fd3ed764ac9ee9eb55