Merge changes I759c65e8,I97699037

* changes:
  logd: test: deal with spam filter turned off
  logd: test: modernize