Snap for 13198286 from df11702cc52d11a9d6d83a966b1a658f2cd11868 to sdk-release

Change-Id: I88bf532142b5b8f835b862cfb2854bf6cc575288