Report the correct partition sizes

Change-Id: If380aa7e10a9b50ae22a86a2e41819389c882e88
Merge remote-tracking branch 'cm/cm-11.0' into HEAD