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