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