am bed348e3: Merge "Manage mode shouldn\'t block for other providers." into lmp-dev

* commit 'bed348e3f1090417df2694d394ad11ef07a1e44a':
  Manage mode shouldn't block for other providers.