Merge "Add light grey APIs." into pi-dev am: 144d5acdf5
am: e43ec5e299

Change-Id: I8886abc2fd5726910f313d15001c279a77922363