AI-616 Refactor OdkTypeAdapter
AI-616 Merge OdkTypeAdapter implementations