[automerger skipped] Merge "Fix bug that would prevent us from reserving right amount of space." am: e27cd0c54e
am: 2a7d4d61e3 -s ours
am skip reason: change_id Id366d478bdd8a748bb1ba97d08a3b52e3cdd1efb with SHA1 b3462c123c is in history

Change-Id: I08820b09d10359e23848f1118b9360d516a9dad1