Merge "Add more APIs to light grey list" into pi-dev am: 208c0ad30f
am: 8960bf0682

Change-Id: Ia4bdd9209dfed1b48aa535bd7d53b343f5664ff6