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