am 24cb4d50: Merge "Fix race condition when advertising app dies." into lmp-dev

* commit '24cb4d5082f4568074e5d1f375027a219aa40be7':
  Fix race condition when advertising app dies.