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