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