Merge "Some more blacklisting."
am: 4bf58cef55

Change-Id: I7f189a68d6f4770a308d1c024f3c12b937751592