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

Change-Id: Ief2805f0cf4a62b4f37f94a814c7ff06540b4bbd