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