am bd59764a: am 8f0e0c1f: Merge "Clean-up state if we have an exception when acquiring provider"

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