Snap for 7717622 from 752886b7465df0cf2ab6c056b033154d29fe7e2e to sc-v2-release

Change-Id: I47217a9b90ab39e34bf0e61179efbaed23ffaceb