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