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