Snap for 7487213 from dc01385cc264d3e17af5fdad9f45eac2bb39ffe1 to sc-v2-release

Change-Id: I54ed501e33a49c6d4b3fad9762f0b8a97144c8e1