Merge changes I2d6f80f0,I9c26852d am: 50522024a1 am: 6151bb7aed am: 2cc2f3b424 am: bfa2706282 am: 8756467fb7

Change-Id: I5899298597fd2fce44c4093338ad19df51b15eb1
tree: 375b7a805e75226301a720007d14fa412a2e5d42
  1. Tethering/