Merge "Blacklist failing tests, and rename one." am: 5736a2d0b6
am: 497d6a63aa

Change-Id: I57c06728538066bd1f737d3b5ed7315579a30b6e