Snap for 6348162 from 7ddcf9576cd42cf71daa6745677f4bbfbf61e958 to sdk-release

Change-Id: Ia43dc0d4fc4ccd4612c6d37b1e4aea19a46cbf33