Snap for 7175096 from 590bb5c0b93111ac68765bd9b17073d6d6e0691f to sc-v2-release

Change-Id: I57a3fcae8d89ac7bf04e67545d3aa14c4ea70893