Reviewed-by: Masatake Iwasaki <iwasakims@apache.org> (cherry picked from commit 2068b0041c05a7b53f32606cc24922cfac299ca8)