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