Merge "Tweak command-line verb names" am: d68e501ff1 am: c5b1b996be

Change-Id: I5c5a6f5e6d9767b4051961c195987d7d512345cb