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

Change-Id: I8a78334c983227366d9c6473dd2205d0b311af5b