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