DM 1.0 compat: do not use EntityId constructor

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