Merge "Use scope=provided for OSGi bundles"