Merge "Remove stopship for permissioncontroller pkg name" into rvc-dev