Snap for 7442307 from b966fbf05518cc31ad3b6e3cefd85287e85661a5 to sc-v2-release

Change-Id: Idd998579e54a43147827cca0fb23858608450ea2