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