Snap for 11541002 from baa7e8665103622b693418d6a08244b8984d252f to sdk-release

Change-Id: I642e82001cc93c8cbf51b974405b72428dc3d325