Merge "Remove opPkg from the notification key."