am fba413d8: Merge changes I04fad67e,I5ab24bc7

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