am 2ae3f60c: Merge "Fix the CPU_*_S tests."

* commit '2ae3f60ca37ce01beba748bb6ffd02401a543721':
  Fix the CPU_*_S tests.