Merge changes I04fad67e,I5ab24bc7

* changes:
  logd: KISS & fix preserve a day
  logd: deal with sloppy leading expire messages