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