am 1314bdb2: am e88fa50b: Merge from open-source gingerbread

* commit '1314bdb2b22ae3613c3e08ae278dbc70f90b965c':
  fix failing thread object run