Snap for 6435660 from e597605e01b63790f5ad6950d13baa9378db1001 to sdk-release

Change-Id: I5cbbc198f68ebe41ddbba6fe72ce5aaf921f954c