Snap for 11692525 from fbe0dbfe121c96c0a1cbb8e61d8699a693b94e4d to sdk-release

Change-Id: I61219474a7f702509eb7bb7b93e4403940fa2e68