Consolidate time format for API Upstream-commit: 6deec021e5bbfd1942cfacb34c6593379e8b8c30 Component: engine