Merge "Change how we calculate system size." into oc-dev
am: 0b75d39312

Change-Id: Icaf7f87f280cd60ed37e02608821ab07815abbad