Merge "Workaround fetching user's package resources" into pi-dev
am: cfccbf9106

Change-Id: I2df0e92521d00b5bc4b41a3bd0c48f7b4199f6b5