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