Merge "logd: address code fragility in last watermarks" am: dd153ef247
am: 54977be62b

Change-Id: I52691027ea5bff4e05d1fb72450b071907b9a43f