aml_tet_331012080
Snap for 8909719 from a34afd602ed1ecfce82b35f2773591e199c7628c to mainline-tethering-release

Change-Id: Ie88e6ed561e18adfc612eec3110f275e4cdcd509