Merge "metrics: Cleanup the system profile setter."