am 2c08546a: am d2b597d1: Merge "Enforce a timeout for Content Providers to be published." into mnc-dr-dev

* commit '2c08546afb01c938e3778a155488b15e326703f1':
  Enforce a timeout for Content Providers to be published.