Snap for 7397158 from 6a44c16d4cf05f44c87c1da5d1ae15388721ab99 to sc-v2-release

Change-Id: Iedff66875765e50490b480dd471e08aaae0fa9be