Merge "More blacklisting."
am: c4861e6355

Change-Id: I060f2fe3993ed597e2759973eba76dd8dc1dcf41