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

Original change: undetermined

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