Merge "Add more hidden API to light greylist" into pi-dev
am: f4f5eb0802

Change-Id: Ied4c12b23db41a7dd425bfaf690628e3bf7bfaba