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

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