am abc3d43a: am fba413d8: Merge changes I04fad67e,I5ab24bc7

* commit 'abc3d43a9da698c5362eb0cb1eb594e241e1884d':
  logd: KISS & fix preserve a day
  logd: deal with sloppy leading expire messages