Merge "Fix how we get provider pkgs" into pi-dev