Merge "Finish swapping packageName and permissionName."