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

Change-Id: Ib5ff51ce1acc651ad46c63e35f286d88cc404e10