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

* commit '4a94f088cea6e550cde6289952d5e745622db3f9':
  Fix race condition