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