Snap for 7362794 from d1eeb4da7d7d45f3a494f8913f18cd50796dc4f2 to sc-v2-release

Change-Id: Icca5e6281020c788c857799216f31b5c0e185b24