Increase max partitons to 28

Change-Id: I6341812abf8a9f27acc6511c4e3f19f526ec2c1f
Merge branch into kk_mkt