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

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