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 am: a028215e7f -s ours am: 3211ee1ace -s ours

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

Change-Id: Iab189d69fcc0fbf1d08686a2cfae3ea59eda8e56
tree: d883384826dd78631885dec0e88af32c285974e5
  1. Tethering/