Snap for 12349386 from 3c41bc3b8cf59e41d9ef327f0f3d7aac2d97c374 to sdk-release

Change-Id: I7546670fadda218e2218fbccd549285f4aefb1fd