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

Change-Id: I47ed1618cce06193464f02cea192d7f139d45785