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