[automerger skipped] Merge "Tweak command-line verb names" into rvc-dev am:...
[automerger skipped] Merge "Tweak command-line verb names" into rvc-dev am: dd8e9d80 -s ours am: dd47e091 -s ours
am skip reason: Change-Id Id72be2181d090f9c32e58fd9c10d32d0d638d550 with SHA-1 8e3e1247 is in history
Change-Id: Iaab0373276c1a029abbeef1ff9d0737c266f5526