Snap for 7526818 from 1d934442ffe93893e1cb0d1361017a281ac90f6b to sc-release

Change-Id: I546c879b91b947843b4e28540347783aa211d1f9