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