Merge "More light grey APIs." into pi-dev
am: eec75058ba

Change-Id: I1d81f2c2aad1276690cbf5207b8b4ace2e4679c6