Merge "Migrate FRM/SM to use model API SchemaContextProvider"