Snap for 7183507 from 8fdfdede292cb139dbbd4c7e533be437144d5749 to sdk-release

Change-Id: Icad7b80227dd812795eec9a393c5510201dd47d8