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

Change-Id: Ibe5037b353b01f7eb523a5a44112e429b230dff2