DM 1.0 compat: do not use Entity::toArray

Change-Id: Id1911ec3019809548210f22366b05d0137b552a0
Merge "DM 1.0 compat: do not use Entity::toArray"