Snap for 7110675 from 88c8330514690d054c2dce70353f8f76615d8dab to sdk-release

Change-Id: Id194e648da210c993ae8ad0e95639f27df820654