Merge "Address aosp/1274403 leftover comment" am: 9f33a5a7d9 am: 3d363f0911 am: 77908d971d

Change-Id: I97924c2caf89eb6021e1b42c688c317a93b104fd
tree: 8133cdd5a77f55fc6f1252122546d7c872273baa
  1. Tethering/