Merge "Populate uniq field in uhid." into rvc-dev am: 5291e518 am: f821b325 am: c2f978b2 am: c3abd000 Change-Id: I824af4acc8358b6aac6f31123b25071eabf2f5e1