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