Merge "Fix failed tests for ApplicationPackageManagerTest"