Merge "Add more hidden API on light greylist" into pi-dev am: 8ef1cb9d10
am: 041acf45b1

Change-Id: I1be1a3625043c45de63e5f3d341a9ec05242ddd6