Merge "More light grey apis." into pi-dev am: 1b32d34457
am: 86c9e52d6f

Change-Id: Ia59f3cd6699d1200e3b592645db1f8ca8cea959b