Snap for 7010700 from ebf9667cd05cba53cb2078c6571f2ae582e80ecf to sc-d1-release

Change-Id: I9dcbeeeb558f18b0bee7cb4c8ca1cb1d4ef515de