(bug 54216) Implement entity deserialization

Change-Id: If5a9fb5415552b4e8fc259ebfa1a3f6693d2ac7b
Merge "(bug 54216) Implement entity deserialization"