Merge "Add more light grey APIs." into pi-dev am: 32256ceb22
am: ade5c9c811

Change-Id: I6956f7a916b4d9686d4b1f1a6e25e1f96a12c7b2