Merge "More light grey apis." into pi-dev am: eb368af5b0
am: 2a47deed31

Change-Id: I5727fca1c950da9ef0c5bf34af30181ee1e906c9