Fix CpuThrottlingWaiter cat failures am: 76a718e081
am: fb8378796b

* commit 'fb8378796bdd86acd9d1d340a4f18aec551ce0d5':
  Fix CpuThrottlingWaiter cat failures

Change-Id: I809a6134a781b9e5658fcdff22460ddee4f7cfc2