Merge "More blacklisting." am: c4861e6355
am: 6be4051033

Change-Id: I759a5a11ff8cb926fc8f5696f9caac1bc51a960b