am cb7f4fd5: am 76ed92c3: Merge "logd: better drop message merging"

* commit 'cb7f4fd50ede96341961bbb29f12b8437b090228':
  logd: better drop message merging