Merge "Convert some users of Time.format() to an alt."
am: 267b83e7d6

Change-Id: Ide4b3813fe9666259f4e94462f89c1683d2ba6ed