am 8c2122cb: am a85cc282: Merge "Fix CS wakelock handling" into ics-mr1

* commit '8c2122cb3e347c607126c49d76fb165125a02295':
  Fix CS wakelock handling