Merge "Fix bug that would prevent us from reserving right amount of space."
am: e27cd0c54e

Change-Id: Ida61d84cdec30ec46e2b931c200a5b8746fc9c00