DM 1.0 compat: do not use EntityId constructor

Change-Id: I09cce86c82412fec9148be05995428434528cfd4
Merge "DM 1.0 compat: do not use EntityId constructor"