am fa097eea: am 4a94f088: Merge "Fix race condition" into lmp-dev

* commit 'fa097eea8620158eef3592376afbcadca39b2e74':
  Fix race condition