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

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