Signed-off-by: Matthew Riley <mattdr@google.com> Upstream-commit: 6c126d443b3ee3bbb6d0a437a1b5c51cbf9e47f2 Component: engine