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