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

Original change: undetermined

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