[automerger skipped] Merge changes I34842acd,Icc6c4d6b am: 68578dd2ce am: b6081962ee am: cfc5bfc703 -s ours
am skip reason: Change-Id I34842acd94b972e440c3622f7617df10c18acf65 with SHA-1 5c14666b09 is in history

Change-Id: I7068557f0d30c9066e9bdcb2dd674dab8964a4b9
tree: 81f7009275c4d91674d7e3bbdda590b2346f0104
  1. Tethering/