Snap for 9669149 from f7ad0fb1c0d69df5d8cfdf941bc8d66e0adb0551 to mainline-tethering-release

Change-Id: Id13445590ff10826b90aaf48abde0abbc6fe4d4a