Merge "Add one more hidden API to light greylist" into pi-dev