am e88fa50b: Merge from open-source gingerbread

* commit 'e88fa50be8d6709ef58b7aeb01c5efa059bcac2e':
  fix failing thread object run