Snap for 7383690 from 09b70721f9032d3dc207f572afddd5d17393e8c0 to sc-v2-release

Change-Id: Ibff9be49a3362ab938b223930d488868d58a8d9c