Merge "More light grey apis." into pi-dev
am: 1b32d34457

Change-Id: I5f43a4d569c4965e3530f856d19e51099c616f75