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

Change-Id: I6541c8ca88e1c380ea3dc9e759c6920f5e1357d9