Snap for 11541002 from f6b93bafffe0c608d939853a4409e7ba7e44bcff to sdk-release

Change-Id: I7bdaba7c60706a5ac3fb7f58ca193ee96048817d