Snap for 7929330 from 28da18e28630c5c8621f773847dfd79d499df1ee to sc-v2-release

Change-Id: I63556b3b164c02255916fcfbf095bf8fdfd4d6fd