Merge "Add more hidden APIs to light greylist" into pi-dev
am: 6021921b94

Change-Id: I5fdff2a1910cc960eb190642c19afd4f1e8ec538