Snap for 7537202 from ac21df22467de02f0974688282641cb542fb0737 to sc-v2-release

Change-Id: Id61126c93f09bdfbc0057eafa7fabed8480018ab