am 3d43d816: am c11b225c: am 7e4a0047: Merge change I97b30e2f into eclair

Merge commit '3d43d816772d0c395f7a3335e6bde421b8539508'

* commit '3d43d816772d0c395f7a3335e6bde421b8539508':
  Revert jparks code from IPCThreadState.