Cleanup SubmitEntityAction

Follow-up to I832bef721f481bf91375174ddecdd3c268ac8dd5.

Change-Id: If3177f26d8646231ad23707aa5c7fdd103beed4c