Merge "[automerger skipped] Merge "[TNU05.1] Address aosp/1237036 leftover comments" into rvc-dev am: 5da521b457 am: 95c0a85b0b -s ours" into rvc-d1-dev-plus-aosp am: 6c83b74711 -s ours am: 26d592adf1 -s ours

am skip reason: Change-Id Ife738339aeae00d2063fea6918b50204daef24fc with SHA-1 1317e27e91 is in history

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