Merge "Tweak command-line verb names" am: d68e501f am: c5b1b996 am: 9c3807c0 am: 75a49e39 am: 7a61a9ba Change-Id: I53238d2f90ebc7f8ded187c0a3e3a20f9e487efb