Snap for 7110675 from 00fd36cdeffb26e5c4c747ad40552b7c1446e534 to sdk-release

Change-Id: Ib33545b3c5e522ae9f95bf1d90e42a7dc9115f79