Merge "Greylist hidden methods for exempting trusted test code"