Snap for 11962796 from 42ef477f7b16e8083a7316df70cae946e731b8f5 to sdk-release

Change-Id: I91dc1a0b2dc1864e3a7bd4db9b1ab3b0214b04e9