Signed-off-by: Madhu Rajanna <madhupr007@gmail.com> (cherry picked from commit 7274bd09e548aee038506e1685b2d77fbc486497)