Snap for 7761443 from d2cce22dda5dc1dc25806febfac0d683c21b2e86 to sc-v2-release

Change-Id: Ib82b09e29676e399c060aff5d692ab7da349d938