rebased canonical/json off go 1.5.1 Upstream-commit: b95048758a06097469901590e68f40bafb5d1762 Component: engine