Merge "Add UUID->leastSigBits to light grey." into pi-dev
am: 95211ec766

Change-Id: I113db5d3b92c59e842afe49680ae3b666701da0c