Merge "Small improvements to am command."