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