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