Snap for 7929330 from fa80a2d5a13e5ccf500389d2d230d55a4165c9e1 to sc-v2-release

Change-Id: I8f3300f3f7a87142e35057a417c2b45e1bc40e6f