DM 1.0 compat: do not use EntityId constructor

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