Merge "mPackages is not a lock!"