Snap for 7379850 from 773eb88779bca47969ceb7db7a669e0606e600b2 to sc-v2-release

Change-Id: I4181a30ec07806fb8d228726a1ea2ef2c0622ba0