Signed-off-by: Dawn Chen <dawnchen@google.com> Upstream-commit: 0b3caf1f78c167239d7879d3bfd0d0d95a48a3d7 Component: engine