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

Change-Id: Ib5c8303d796958136ee586bbcd63cbbe33e12e59