Snap for 8096610 from c03eebc74d6227cb304df10973d57284b114f810 to sdk-release

Change-Id: Ibb2474f3cc81e038b2bdaaeca27bf47dbf62f9c8