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

Change-Id: I069aefbfa47a80ba263e587283a3dffafea82814