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

* commit '0252f43322b2997f609fc698e281dbbb2a43404f':
  logd: prune maintain per-id watermark (part deux)