Signed-off-by: Xiaolin Ha <haxiaolin@apache.org> (cherry picked from commit 486d19e99ff4370bc60e0db235508198c84a00e3)