Snap for 7479185 from 53af90b7dd9e82f49df10c0c421f68cdc3e80e9c to sc-d2-release

Change-Id: I63dcd0a3a4c25b22a0fd768f0b6d2170256fdd13