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