am a7d47092: am a75b3de2: Merge "Mark time conversion functions as constexpr"

* commit 'a7d470920f7d92b58e6072c6e5555204655d0467':
  Mark time conversion functions as constexpr