Merge "Light grey APIs." into pi-dev am: e4cf84138c
am: 02245e7f7a

Change-Id: I6ac807b995b7d646af6bc7e3276e5f6aae7195fb