Merge "Add more light grey APIs." into pi-dev am: a0e2aa194f
am: 9e1549cc7a

Change-Id: I26dbfa981759ff712a18bbe37c968d0b1e0edac0