Snap for 8046958 from 0a3fff4ba4800ee303f7f0e7692329e7957e6a56 to tm-release

Change-Id: I4a63722fce4641b21935c784932000edaa2b81c5