Merge "Remove unused mount modes and re-number the modes for consistency"