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

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