[automerger skipped] Merge "Convert some users of Time.format() to an alt." am: 267b83e7d6 am: 1b0c2fcd3b am: 646bdf8e89 -s ours
am skip reason: Change-Id Ib142979858012bb766b4c107d41a21b0324de506 with SHA-1 9aa7b74a7a is in history

Change-Id: I06bea6151bff226fd4d7b52f1038f681b5b469a9