Merge "logd: prune maintain per-id watermark"