Snap for 7256110 from 30ab38732c571957f9e174cfcdc7121e5331904c to sc-d1-release

Change-Id: I6a5bc810aba635d103a62408c78dbaa63ccbba5c