Snap for 7101549 from ccfdfe4749bf5ff3c090ace637fbc03f78b767b8 to sc-v2-release

Change-Id: Ic75f2e91ba9793713c6269b6a37971ee47c69627