Signed-off-by: Deepika Upadhyay <deepika@koor.tech> (cherry picked from commit 427c53786b)
427c53786b