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

Change-Id: Ic74c8ed1d0f3f61b2a3c9e7e677483fdf8fac8de