Merge "Some more blacklisting." am: 4bf58cef55
am: 0569b82903

Change-Id: Ia6552cfd1a13430c993213ed0f714de0daf9379b