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