am 8aa8d1ef: am e148b7eb: Merge "logcat: white and blacklist failure"

* commit '8aa8d1efc1eee663502e68e04a05f87ae1d3fd0f':
  logcat: white and blacklist failure