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

Change-Id: Id96e16934fec482dad5a9a6aba5100ceddf1cca1
tree: 44ebb4afe7b61a64f67e4fe0083c965be294a475
  1. Tethering/