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