Fix EntityHandlerTest with the new serialization format

Change-Id: I2f268584f78d854832de63a324c4c8813eca4b76
Merge "Fix EntityHandlerTest with the new serialization format"