Snap for 7183507 from b6847a666fe018c3c159bad042b408b41de86de8 to sdk-release

Change-Id: I5eb087582059ca20c6d1ae5a825426d6c68f95a7