Signed-off-by: Hiroshi Hatake <hatake@clear-code.com> Upstream-commit: 3ed3b33e558490db088103404e03539f5a3df832 Component: engine