Partition info fixes

Change-Id: I2e5b5c6ed9119d312c0d30da51ab10323cae33fe