Merge "Use "real" free space; refresh on large changes." into oc-dev
am: 6428beec23

Change-Id: Ic464de2c77983dfbb9cdcc7cc6a27062d866797a