Merge "Moved Schema Aware logic from DataStore to SchemaAwareDataStore adapter"