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

Change-Id: I4e43585a0fd1159b483d3f7cdc9ba86d23adf694