Snap for 9847046 from 2b07c08b1175915f7e8b624a5143743ebb6f7a37 to mainline-tethering-release

Change-Id: I39450836c864c54b6ff7a2150ae32f8296d27b2c