Snap for 7550844 from a2707050575cdf1c3a3519c0a6bc0535a581c6a1 to mainline-tethering-release Change-Id: Ifd59816769331298503e05fe9b6e3ca33cc086bb