Snap for 11541002 from c9be9db1c898a3e8542715987e4532c473907f3e to sdk-release

Change-Id: If673c04059cd0b07db0cd9b193e3677ea1109df3