Merge "Switch to standard naming scheme" into rvc-dev am: f94d682a9b am: a0460cb747 am: f674d80e86
Original change: undetermined Change-Id: I939a5c09b990b95eb86015387863cfd3922f8801
This commit is contained in: