Merge "Avoid creating /mnt/user/<userId>/package/<packageName> for all pkgs."