Signed-off-by: Masatake Iwasaki <iwasakims@apache.org> (cherry picked from commit 6b8107ad97251267253fa045ba03c4749f95f530)