Signed-off-by: Madhan Neethiraj <madhan@apache.org> (cherry picked from commit 298fdb9d2e14227676da7448bdb5d54a1a6a1db6)