Add test to EditEntityTest for the fix in Gerrit 135489

See Ib0fd773dacddc782a93f53838c1189e41d16e748.

Change-Id: Ieafb629604f4680c23f9227b975f73b6dba8476a
Merge "Add test to EditEntityTest for the fix in Gerrit 135489"