Merge "[automerger skipped] Merge "Address aosp/1274403 leftover comment" into rvc-dev am: 305c46de82 -s ours am: f097d7e7c4 -s ours" into rvc-d1-dev-plus-aosp
tree: 8133cdd5a77f55fc6f1252122546d7c872273baa
  1. Tethering/