am 47a105a7: Merge "Small improvements to am command."

* commit '47a105a720a83a6d0c58962f8024e28a4baa5b06':
  Small improvements to am command.