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

Change-Id: Ice5238aa16fa7864f86f985ed27af7ad00feaf70