Signed-off-by: Duo Zhang <zhangduo@apache.org> Signed-off-by: Viraj Jasani <vjasani@apache.org> (cherry-picked from commit ee632bdcaefe34f2f51d2f528a480bd492e3a2ae)