am 7776457d: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '7776457df5639aef8e836cded2de28118e2841da':
  ugly, temporary, workaroung for a problem where a binder thread spins forever