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

Change-Id: I750d20365ec5257a64c6ef325dcf29875f4d84ac