Merge "Switch to standard naming scheme" into rvc-dev am: f94d682a9b

Original change: undetermined

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