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