Signed-off-by: Xiaolin Ha <haxiaolin@apache.org> Signed-off-by: Duo Zhang <zhangduo@apache.org> (cherry picked from commit 4454c2f90949950c1ed3b54c0e2e60b730a5178d)