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

Change-Id: I1b3938f1c64816a4bea2f3b4bf094aa82fb87111