Snap for 13198286 from 21eff5b8df047b1f56e76f1b39829349029827a3 to sdk-release

Change-Id: Ia43d0e8200a18a2b2f9053b12df71b05e8b86dc2