Merge "[TNU05.1] Address aosp/1237036 leftover comments" am: 14fb7f6fac am: a91e5e5da6 am: eef15b96ac am: 5a0d178f04 am: 4ba6b37650

Change-Id: I4da700556ade571ab9d96c78b3966d64bdd44328
tree: aa307cabee8f5f6b5c74c1aa0d7e0ec1b4ecd3cc
  1. Tethering/