am f246b484: am 99391361: Merge "Midnight should mean midnight" into lmp-mr1-dev

* commit 'f246b484c5cf8b63e1b700d17e8161f566e3f5d7':
  Midnight should mean midnight