am 3a7d4b4e: Merge "logd: missing klogd content"

* commit '3a7d4b4e2a4c221eacc2826c3261894bbb5faba2':
  logd: missing klogd content