Merge "Merge "Switch to standard naming scheme" into rvc-dev am: f94d682a9b am: 672fa36bdd" into rvc-d1-dev-plus-aosp am: 7a5db197dc

Original change: undetermined

Change-Id: Iefb0bff5a646b267e4d60f644c4d924a0ca36c8f
tree: 16eacf6bf9b6d168892bb179830f8a6c31db198b
  1. Tethering/