Merge "Revert "Blacklist test."" am: fc7662f73d
am: 652d99d5ae

* commit '652d99d5ae77c0c7d1c96d8e61b071208b72a8e0':
  Revert "Blacklist test."

Change-Id: Ice8410dfc9d05861b8eb151a66136bcf51245f03