Snap for 7347062 from 67bc31ee4fb7e3407a0ca6d4b3ba899d23ecd6c5 to sc-v2-release

Change-Id: I1a3c430ee0f57b4266a877c791b42817230b241d