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

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