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

Original change: undetermined

Change-Id: I57cffc68409c2e9b795b0c8732fecc9bbf33e113
tree: 5fd9235cac92342aa37d9536fa9d0eb90703b2f6
  1. apex/