am a8b6131d: Merge "logd: test modernization"

* commit 'a8b6131ddf5ce6f72115d53c44ac54a44c24ea02':
  logd: test modernization