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