Snap for 7430084 from 6eff99a7d356dd068e801cd8280a7b628362e121 to sc-v2-release

Change-Id: Ib285a975d55cb27147c2d4cc8449c7a14d800736