Signed-off-by: Wei-Chiu Chuang <weichiu@apache.org> (cherry picked from commit af64ce2f4a72705c5b68ddfe4d29f0d208fd38e7)