Merge "Add light grey APIs." into pi-dev am: 95b7e63103
am: 5824fce1c8

Change-Id: I12a12d78e5e03ea4637ad6329ec6175cdb5f3df3