Updates to cm performance settings.

Change-Id: I1dc05f96a7e011d466d73d07e36e47725622cb82