am 2e6fce31: am 923f55a5: am e21f6af3: am ee4a534b: Merge "Timeout when partitioning takes too long." into mnc-dev

* commit '2e6fce3137df876aab597935aaaf508802d17d06':
  Timeout when partitioning takes too long.