Merge "Move forward lock utilities to PackageHelper"