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

* commit '6bda7716405f3ddc8571c578beaaac4368c840d0':
  logd: test: deal with spam filter turned off
  logd: test: modernize