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

Change-Id: I9276b698b97d317ba465ab162d191c05841593e0
tree: e8b647d4fb356206885a0b3816d69be68b48df2a
  1. Tethering/