Merge "Add hidden API on light greylist" into pi-dev