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