Merge "Improve am --help wording" into main