Snap for 8076550 from aa73129ab37a1c4f14096d24a35e171e3d3cfd0b to sc-v2-release

Change-Id: Id5240181726cd7d66c349ef2a0ec86398260e448