Fix serialization issue (#12703)

Change-Id: Ibdced8cdc3200ccfef2750e32fc8bf8dc544f1ae