Signed-off-by: Jake Sanders <jsand@google.com> Upstream-commit: 305801f58f22c9a26bc05eaa800e399afb212fe3 Component: engine