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

Change-Id: I7bf5c3c6fac1af61c40626b7c47f983fab5802ef