Merge "More light grey APIs." into pi-dev am: eec75058ba
am: 73bd001368

Change-Id: I7d5e66140f132429bd3d024515258a33ade85b6e