Merge "Mark passing non ObjectFactory spec to ApiModuleManager as deprecated"