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