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

Original change: undetermined

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