Snap for 13198286 from 308d11e7e0d9fdc91b3faba4abbcd762b8230f2b to sdk-release

Change-Id: I9bf4f53bde6f2ca8cb5c7e017cea6f10b7da07c4