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