Merge "Add more hidden API on light greylist" into pi-dev
am: d55a940e9f

Change-Id: I2c126962323a65e04314b1e8aeb0bafc4c03aa98