Merge "logd: prune maintain per-id watermark (part deux)"
am: 390100305b

* commit '390100305b032d0d6bd42a1797c01b35c714d13f':
  logd: prune maintain per-id watermark (part deux)