Snap for 7286185 from 79ebc78d496768513376612bba78546a1c1f0688 to sc-v2-release

Change-Id: I1525c55ca0ff638390d259f71b1784b8eaf3005f