Merge "Support both user and carrier edited values." into lmp-mr1-wfc-dev