Merge "Package Manager: Use new DexFile function to upgrade filter" into nyc-dev