am 5f421f16: Merge "Make Barrier robust against spurious wakeups" into lmp-mr1-dev

* commit '5f421f16b6f8866233eb5d7d40991c2b00ec1482':
  Make Barrier robust against spurious wakeups