Snap for 7256110 from 94c9edb3d0a3c3d29ca67510768afda3a5c2c47a to sc-d1-release

Change-Id: Id49e901811fb7668e379c3669bdf6a3ac103a8c9