am f59b605f: Merge "Fix race condition in TransitionCollector." into lmp-dev

* commit 'f59b605f82c0e2b7bfc6019ee7bd650628f50d3a':
  Fix race condition in TransitionCollector.