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