Snap for 11841552 from eba1957a8a21830cbade8990643c019a3e3767b8 to sdk-release

Change-Id: Ic7891d37bfbda367dcf2b5460ffcc3ab2e0e55b7