Merge "Make default carrier name string look better." into lmp-mr1-dev