Merge "Add more hidden API usages into greylist" into pi-dev