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

Change-Id: I50da3326bb8785df65d112497cc8a3c436c050b6