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

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