Merge "Make Barrier robust against spurious wakeups" into lmp-mr1-dev