Snap for 7110675 from bdb8c8575e548bd3c8da5f58fa1e329e2ad380aa to sdk-release

Change-Id: I93eecca92cc39dcff8ded69760652feb4ff9e968