Merge "Add packageName argument in preparation for per-package lock."