Merge "Refactor the PackageBackwardCompatibilityTest"