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