Merge "Add unit tests to verify EDITED preservation" am: 752067ed01
am: 84ee94f77c

Change-Id: Iba8941aabfa83c1ad7b9eb48d7db9e253fc57fc3