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