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