Merge "Basedir of a bundled app is added to the permitted paths" into pi-dev
am: 7df104c4bb

Change-Id: I60e0f2596b08194569aa0d5d4303b6892622a9c5