Snap for 7325276 from 08507275f7b443865837f78415642365450dfd70 to sc-release

Change-Id: I44919efb6c592af658946a2cb64340259eeb6450