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