Merge "Add unit tests to verify EDITED preservation" am: 752067ed01 am: 84ee94f77c
am: 8559746e34  -s ours

Change-Id: I0647e03b98fa556fae452ff4a9e456caa573d218