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

Change-Id: Ibeecaac42460e3be81d4670b7b3a390a16cc2c7e