SCHEMA-648. Compatibility change for new schema bridge API.

Reviewed-by: Daisy