Merge "Update comments now that mPackages is no longer a lock"