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