am a2f85ca0: Merge "Avoid race in single thread suspension." into lmp-dev

* commit 'a2f85ca0dd0ddab384f395ab270d844affb8fdac':
  Avoid race in single thread suspension.