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

* commit 'db9d60940bde9dee18f0efaeac7e175c9e7a9286':
  Fix the CPU_*_S tests.