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