Snap for 7183507 from 36a18716db4c64dee137eb4d259e40b06aa2f190 to sdk-release

Change-Id: Iac9b47cc3aec2716727e365631e8ade13f95d35d