Merge "Merge "Add more light grey APIs." into pi-dev am: 4c9902ada3" into pi-dev-plus-aosp
am: d3a955cd03

Change-Id: I333fc8519a0378a3a60cc9584e2586a456d89587