Merge "Merge "Switch to standard naming scheme" into rvc-dev am: f94d682a am: 42340d5a" into rvc-d1-dev-plus-aosp