Merge "Address aosp/1274403 leftover comment" am: 9f33a5a7d9

Change-Id: I89d306a86ae993b0fdc26c701624d5c6735f0df7
tree: a81bc1cbbd3a0ea88f3d475fe52a911a82a5e5cf
  1. Tethering/