Snap for 7110675 from 4b1bd5d6804c250d6f6724ea799cbf7f2994da2a to sdk-release

Change-Id: I45667ee670519f5cab64a803768cb1c34de59a52