Snap for 7266196 from de10f9892e2335578872794cb75ff4f8461a723a to sdk-release

Change-Id: I0ababf8805ee592be1ff6af4bbd5717b0d3e49b5