Backport ProviderStatus by using its old definitions
am: 2795a88a8e

* commit '2795a88a8e89a44f7dc4334cc2ae00bbd19dc2c1':
  Backport ProviderStatus by using its old definitions