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