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