am 87ce99ca: am ced7ebdb: Merge "Migrate off timeFormat12 and timeFormat24."

* commit '87ce99ca7243e4556a6cfe9f42cc51531301e979':
  Migrate off timeFormat12 and timeFormat24.