Snap for 11962796 from b185838558d73c15b69cd2b6ecc9796df3a3cbeb to sdk-release

Change-Id: I1f09aa19ed5660bffeef1f2fa7e2742e70bdf7c3