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