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

* commit '2d1e5e9680dcd29628f100c172e6d7d17d90ef2a':
  Extend the maximum number of partitions from 4 to 32