[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 am: 1d7d3b9d -s ours
am skip reason: Change-Id Id72be2181d090f9c32e58fd9c10d32d0d638d550 with SHA-1 172dfa15 is in history
Change-Id: Iccefbb382fe66cd2ce7f328b7cc7cdad02592924