Merge "Fix up PackageManager tests" into gingerbread