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

Change-Id: I7a0efbf7745fe52d9dbefe94ead07be603b6f96e