Snap for 7550844 from 803264e51cda319201598f81b8c1b6ff49226275 to mainline-tethering-release

Change-Id: I2b4f59ea4346815f52bba424c8f22a09286b0563