Snap for 7183400 from 17b1005286e1fa9d6d84d1ede8062098aae06ff5 to sc-v2-release

Change-Id: I0c0a480a0bedf66912fc6d773cb220288349ce33