Support both user and carrier edited values.

Change-Id: Ie2c2515e2208fbb77f8d071e17756de5decc7315
1 file changed