Merge "Migrate off timeFormat12 and timeFormat24."