aml_tet_341010040 (10764680,com.google.android.tethering)
Merge cherrypicks of ['android-review.googlesource.com/2737694'] into sparse-10731935-L99700000962927444.
SPARSE_CHANGE: I64f48f5337caa36e53d33d5a300ee0ed25aa29ec

Change-Id: Ie8dfb72fb106ad7146ffe9de9e23491e2ddf77d2