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

* commit 'ccfb90d1aaa3cf334be4cfda1131a533489326bb':
  logd: prune maintain per-id watermark