Snap for 11962796 from c70f4395f7b0e9f36dfb6325caa81dac3ddd77fc to sdk-release

Change-Id: I72592dc670c1f18c571342a86e891755b9f74f63