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