Snap for 7472272 from a9484901ce000bbde87327a08e583ed21bca940e to sc-v2-release

Change-Id: I5e33a7f75cf5d60c5437a374d10df6f45bdb6176