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

Change-Id: I07dd1b7ef7f52c57a7d5020e4d274950923a50fb
tree: d883384826dd78631885dec0e88af32c285974e5
  1. Tethering/