Revert "Migrate off timeFormat12 and timeFormat24."

This reverts commit 4b0cba3867bdf0de037ccfc58754df3c8fa47db2.

Change-Id: Ifefd6b072346d386e07fe623cc59d89f712decf8