Merge "Hidden API blacklisting killswitch." am: 46656fa28e
am: 84259cea59

Change-Id: Ia0bcbfb2cdc84a6a8a82f82ecda82f46ba46dab1