Snap for 7521311 from f3c6c3e5b400912e8b060e527018fdd2a31ef02e to sc-release

Change-Id: I8fb8bced548b44becd0a32ba9e32129ad75284d2