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