am 9f621cf8: am 6bda7716: am 9e7bef0e: Merge changes I759c65e8,I97699037

* commit '9f621cf8724859419bbb058f197a0b4fa691aa4e':
  logd: test: deal with spam filter turned off
  logd: test: modernize