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