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

Change-Id: I290198bc6bb4a8c0199757da5b8b9e4a797a698f