Merge "Add more APIs to hidden API greylist"