Merge "Greylist hidden methods for exempting trusted test code" am: 2a661bff82
am: de5eb7d274

Change-Id: I2af67a92fae3f14acfc1c5a75ac874ceb7ca3302