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

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