Snap for 11356374 from 7b106654a8e5cbeec55d1e10cc0bbad6774b98b5 to sdk-release

Change-Id: I7a6794eb771a2cb0caf26f20a7820d3258841b61