Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp> (cherry picked from commit 837b9c6214cd43828473d15175b0a3c6e1db8507) Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp> Upstream-commit: 90c72824c36369efd8be52bedd731d12b3415508 Component: engine