Signed-off-by: Takanobu Asanuma <tasanuma@apache.org> (cherry picked from commit 9dff6eff819a832a5918d786675f42aa243a13e8)