DM 1.0 compat: do not use EntityId constructor

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