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

Change-Id: I3ac49ac3f6453dcb9726e77d67768d3fc54f35e1