Snap for 7721244 from f223ecd78ab36301a36cf56ae7dc4ac3ea153592 to sc-v2-release

Change-Id: I9c5a6ff1207613a6ec66cbafde55fe0eed9f06f4