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

* commit 'ced7ebdb1d522b4206e2048b278554ca841aeaba':
  Migrate off timeFormat12 and timeFormat24.