Merge "Avoid to get remote package from disabled component"