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