Signed-off-by: Chris Seto <chriskseto@gmail.com> Upstream-commit: 83cb28857551d0077b3877d1de1c3c44a39da705 Component: engine