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

* commit 'e21f6af3b68d3fcfb2de661c100bca2f7f093d88':
  Timeout when partitioning takes too long.