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

Change-Id: I1cb9722000898c9d1a7d479e9b0d88f717c57414