DM 1.0 compat: do not use Entity::toArray

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