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