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