Snap for 10447354 from 0f9de4435eccc3c023e68f243620ffb8449428df to mainline-tethering-release

Change-Id: I0bdae186a2b99f890571143a365098adb9fa281f