Merge "Fix instance of using mPackages as the lock"