Snap for 13198286 from ed90d92a6557101b1ca056daa2800c59600d38f0 to sdk-release

Change-Id: I077624f723907b0bd777caa29c1a16c12823d844