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

* commit '2beb86ed1ab3cb0549ebc03374e5fb7714764bf0':
  logd: test modernization