Merge "Merge "Switch to standard naming scheme" into rvc-dev am: f94d682a...
Merge "Merge "Switch to standard naming scheme" into rvc-dev am: f94d682a am: 42340d5a" into rvc-d1-dev-plus-aosp am: 8199ac51
Original change: undetermined
Change-Id: Iefb0bff5a646b267e4d60f644c4d924a0ca36c8f