Snap for 11566117 from d49c89822666ee792b7bd49a953261498a305016 to sdk-release

Change-Id: I3312937ad7465c6c9cbd9f53fdfa8f8f6596e9e4