Merge "Fix how we get provider pkgs" into pi-dev am: 860a3640d4
am: 6351ab4769

Change-Id: I72f276d737849031e82a9bc5e6d1a938df22b3cb