Fixes serialization-related errors

Build-breaking error introduced in c14334f284c7e7c344b2983726b9242e3ef8562e

Change-Id: Ie27ffba1f700b9373f446a61f78cac2c2d3e23bc