Merge "More light grey APIs." into pi-dev am: ce30fd3904
am: 498b5ce40c

Change-Id: I0272dd2be494e4ecdd6e18319b1b25930223c4c0