Snap for 7924855 from b9d90b2059ca7c7955d4f7cb021b89bcb6158e6c to sc-v2-release

Change-Id: Ib6c2c32f82178a8bb27c053c7aceb954ffa45ed3