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

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