[automerger skipped] Merge "Address aosp/1274403 leftover comment" into rvc-dev am: 305c46de82 -s ours

am skip reason: Change-Id I81f2d268c9f26bc4488b06032477a73d071f73f8 with SHA-1 eaa2b0e30a is in history

Change-Id: I58431d6a0969b0de91e000578bd176caa6d19862
tree: 8133cdd5a77f55fc6f1252122546d7c872273baa
  1. Tethering/