Merge "Fix calculation of empty spaces" into rvc-dev am: 6813206e6c am: 2248146de8

Change-Id: Ie1e521c05d2367409a6fcf28f995d701b7ec8227