am 5695b4bb: am f7e7ee96: am 2d1e5e96: Merge "Extend the maximum number of partitions from 4 to 32"

* commit '5695b4bb1c87a5c6ca884262f7940526ddcc5883':
  Extend the maximum number of partitions from 4 to 32