Fix ID conflicts in EditEntityTest

EditEntityTest was using fixed IDs for entities, which would
conflict with the IDs generated by other tests, depending on
the order in which the tests were run.

Change-Id: Id2b60be02baf5200986091b2eedaa07c4b98b6f1
Merge "Fix ID conflicts in EditEntityTest"