Merge "Hidden API blacklisting killswitch." am: 46656fa28e am: 84259cea59
am: a8bb7189ba  -s ours

Change-Id: Ia1137d759b1618e2ec1acbd07e4458f0a625b124