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