Merge "Convert SchemaSourceRegistration to extend ObjectRegistration"