Merge "logd: address code fragility in last watermarks"