Snap for 8446956 from 2218271009abc6b76549bc7fadcc1acd584e510f to mainline-tethering-release

Change-Id: I1525bb3ce7405c366f2552e0c94f1d60e22a5629