am 44376fe5: am abc3d43a: am fba413d8: Merge changes I04fad67e,I5ab24bc7

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