Merge "Fix bug that would prevent us from reserving right amount of space." into qt-dev
am: 122bf2aedf

Change-Id: Ie69f16acb87a9571f2a4b95932f29a01c5ed9fd3