Merge "logd: regression in handling watermark boundary." into oc-dev