Merge changes I2d6f80f0,I9c26852d am: 50522024a1

Change-Id: I584138925bf090c1c4b600fc2327220d7e5e39c9
tree: b8acb7821a5c78de63dba7603ab828a07820fb4a
  1. Tethering/