Reviewed-by: Viraj Jasani <vjasani@apache.org> (cherry picked from commit 965e3874e90f7ca7cf6d1418893340338eb8760f)