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

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