Merge "More light grey APIs." into pi-dev am: 30e5b27cfe
am: 2e5944de8b

Change-Id: I5120889e3102a95b95d0920c63881d94e9b576b0