Merge "Update command line usage for pm"