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

* commit '0d78b1644a7ca20ccec1201bc748d01be6a7ebd1':
  Enforce a timeout for Content Providers to be published.