Merge "repo selfupdate: Fix _PostRepoUpgrade takes 2 arguments"