Merge "Blacklist test." am: 568b172683
am: 6b856b0cd8

* commit '6b856b0cd8601abbb96da48d2bc83e8054440fcd':
  Blacklist test.

Change-Id: Ia9d257a7c723cd7216ded52fbdbf4c0685eb7ca3