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