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

Change-Id: I29c38ac08149324c218f244990a8ab3edb9f070c