Merge "Fix add-apt-repository"