Move adjustment of some CR parameters to existing function.

Refactor/no change in behavior.

Change-Id: Idb3c55b1304feaf689b90403f79bc96dba26f060
1 file changed