am 5f6e4339: Merge "Use SimpleDateFormat for time zone formatting."

* commit '5f6e43394dd89432b241f32cd2c96d87c3ad5040':
  Use SimpleDateFormat for time zone formatting.