am 4d9f9384: DO NOT MERGE - Reduce spin-on-suspend complaints.

Merge commit '4d9f9384999b14acc996ed621e1205b389845f13' into eclair-mr2-plus-aosp

* commit '4d9f9384999b14acc996ed621e1205b389845f13':
  DO NOT MERGE - Reduce spin-on-suspend complaints.