Merge "Separate CPU intensive test from system server"