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

Change-Id: I957ef767bf25ed36b4fb05e2cde6715c6b99cd56