77315abe47
Reviewed-by: Masatake Iwasaki <iwasakims@apache.org> (cherry picked from commit 2bd810a5075e6b9c15fde22e43ac9bcf2a6c22f9)