Snap for 8000352 from c5b6181e33b7668a18efe5d50a726922fc486335 to sc-v2-release

Change-Id: I58b9702156e122355608dd51dac53a9fa9a36763