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

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