Snap for 7562097 from a2aba786fefb62f14bf3e6d4b6552dda78857445 to sdk-release

Change-Id: I9b811df3f3bb58872219c4bc5ae4bf9a6003877d