Drop a few additional EntityId type annotations that are breaking in prod

Change-Id: I0acd2096d21bbcff18014fa006428932ce087aff