Signed-off-by: Bharath Vissapragada <bharathv@apache.org> (cherry picked from commit 6a4c9be967f1b0c29cf937927e0b6aec929721f9)