Merge "Just round up the data partition size." into oc-dev
am: edcbf28b7c

Change-Id: I2003f048cc83cfebcf4950734b586483497fae67