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