Merge "logd: prune maintain per-id watermark"
am: 7b7b2da6b8

* commit '7b7b2da6b82d9477591a183efde262ead33812fb':
  logd: prune maintain per-id watermark