Merge "Add more light grey APIs." into pi-dev am: f90e8323ff
am: 93a10e1a5b

Change-Id: I08ff1bb784b87d2fb8944067c10bb1c989e3e9e5