Change-Id: Iacfeb3f4c7324df825ab9c3a67d5bfa225fbdf1c (cherry picked from commit c78801e2e7) Ticket: SAMBAR-197
c78801e2e7