(cherry picked from commit 1b29c9bfeee0035dd042357038b963843169d44c) Co-authored-by: Masatake Iwasaki <iwasakims@apache.org>
(cherry picked from commit 82ff7bc9abc8f3ad549db898953d98ef142ab02d)