Merge "Blacklist code for CFI." am: 5f50896a7f am: f1e39159c8
am: cdf79d7298

Change-Id: I5ada41559bca3b98a48e6fb29c535e445f7ef7fb