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

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