am e2047da6: am d9bf2652: Merge "Revert "Clean-up state if we have an...
am e2047da6: am d9bf2652: Merge "Revert "Clean-up state if we have an exception when acquiring provider""
* commit 'e2047da6':
Revert "Clean-up state if we have an exception when acquiring provider"