Slight Refactor of EditEntityAction

Change-Id: Id7b9fb022a24e4a534fe3f7b8b822f43b0e349c7
Merge "Slight Refactor of EditEntityAction"