[automerger skipped] Merge "Merge "Merge "Switch to standard naming scheme"...

[automerger skipped] Merge "Merge "Merge "Switch to standard naming scheme" into rvc-dev am: f94d682a am: 42340d5a" into rvc-d1-dev-plus-aosp am: 8199ac51" into rvc-qpr-dev-plus-aosp am: f8361e8d -s ours

am skip reason: Change-Id I0c31e2183353dfb5bd49f04f3455cb7b10be6866 with SHA-1 8b864fb4 is in history

Original change: undetermined

Change-Id: Ic4e43d7676d2650dd5da61ad9db394c0e399cc50