Merge "Validate pid can be trusted" into sc-dev