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