Snap for 7513903 from efa5e9f5ea5f92f6f0bad5eac48112e714be3064 to sc-v2-release

Change-Id: Ib1234abfc3074ad8ea08ac330a36f13f7469d66f