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

* commit '923f55a549957e4fb1edc24086ee80157e6050bf':
  Timeout when partitioning takes too long.