Snap for 10447354 from 12f68c351f6540352b8bbe53b468172980d31828 to mainline-tethering-release

Change-Id: Ic054be94e0f84b2dd78f448acaa721f1fd1563c9