am bfd15fa0: am 6b96e2f0: Merge "Two REMOVE_PROVIDER messages caused by race condition."

* commit 'bfd15fa00557ea78567a30fe260dea62c37bd5a0':
  Two REMOVE_PROVIDER messages caused by race condition.