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