852db790d3
Reviewed-by: Wei-Chiu Chuang <weichiu@apache.org> (cherry picked from commit e119063a078f06523158dba3b9e16ca04768e920)