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