Snap for 7588529 from 2279c1f5e2443f5b19750ede7de33da63e703dd2 to sc-v2-release

Change-Id: I4df8fea97335e94d5f43d571ddbac43ad7b99db6