Merge "Blacklist test in right expectation file."
am: 386568bc89

Change-Id: I492e9159682b7b698913dafd8a9ceacfbab7597d