Merge "[TNU05.1] Address aosp/1237036 leftover comments" into rvc-dev am: 5da521b457 am: 95c0a85b0b am: eba9f7a887

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