Snap for 7629706 from bb0c70c0dd922c95e4049906a6f4b2f864e5bd09 to sc-release

Change-Id: Iab9bb91e46484faec3313937606643f51bb53f1e