Merge "Changed Instances of rawParams() to plaintextParams()"