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

* commit '99391361217cd9234ddc0570055677863cb6fb34':
  Midnight should mean midnight