Snap for 7550844 from d542bcf5c7c83f8c458763a5f6bb3356e07e80dc to mainline-tethering-release

Change-Id: I71d1adf860090433563762dc82b5f245bf4454ca