am 9e7bef0e: Merge changes I759c65e8,I97699037

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