Snap for 7110675 from 5d40d747e919bc803e77544c6d9e5879f4fe0ae8 to sdk-release

Change-Id: Ibdf9d271dabae3de3b11fc69598017cd071e1d24