am 6a9dda6c: am a8b6131d: Merge "logd: test modernization"

* commit '6a9dda6c060e7cdf34b3a80deecd8fb2cada92b9':
  logd: test modernization