Snap for 11962796 from 7df41c52a5cb27254ef0afaa7817dce5f4fe7426 to sdk-release

Change-Id: I486e126bd0f343c531d98f29560edbc60046a28b