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