Snap for 7110675 from e4c67ec21355f4d4e751b829c2758f4271dfff09 to sdk-release

Change-Id: I3c2ed8eea811059ad6014b593f12b1da9caa1204