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