am d9bf2652: Merge "Revert "Clean-up state if we have an exception when acquiring provider""

* commit 'd9bf26522b930a8d5d25f6e28c390e39fee6d0b2':
  Revert "Clean-up state if we have an exception when acquiring provider"