refactor: Improve null safety of Json Serializer Change-Id: I1bcab43039c0995e52c530a0e29fb117add1337d