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

Original change: undetermined

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