Add canonical import path Upstream-commit: 3a633a712c8bbb863fe7e57ec132dd87a9c4eff7 Component: engine