am 8c4c7b6a: Merge "Use H rather than k in date/time formats."

* commit '8c4c7b6a9851554371f94aef9f09813a7f0bc14e':
  Use H rather than k in date/time formats.