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

Change-Id: I1276e1eb5b2d4438ebc6f071ed28f1f322a8bc6e