Merge "Address aosp/1274403 leftover comment"
tree: a81bc1cbbd3a0ea88f3d475fe52a911a82a5e5cf
  1. Tethering/