Merge "Add light grey APIs." into pi-dev am: d60512c0d9
am: e3f88ccd42

Change-Id: Ib4ff65ddafa6930d6e0f725ad6d49cdec3ae8e2a