Snap for 10605052 from 1d336944257fce086ce3e1efeddfeaea55c1f0d0 to mainline-tethering-release

Change-Id: I69c75cf007bf1f545d379378e4252144e923d6b5