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

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