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

Original change: undetermined

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