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

Change-Id: I5f19784d6ad4bf3c643bb91264fe4e9dbba31268
tree: 4bbdddde89de91a2f3aaa854f8e4d1a4a557aab4
  1. Tethering/