Merge "Default EDITED column to CARRIER_EDITED instead of USER_EDITED" am: ae17a07ec5
am: 9f4fa014fa

Change-Id: Id22758e7533eaa893a3a8ed2c5989fec05773a3c