Merge "Error prone checks for mutability flags on PI"