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