Merge "Address the comment of aosp/1288493"
tree: 2c600f86391ba2d997153968dda41df34e0ebd14
  1. Tethering/