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

Original change: undetermined

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