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

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