Merge "Fix calculation of empty spaces" into rvc-dev am: 6813206e am: 2248146d am: 7b8c0830 am: 662ef38c Change-Id: I8dc18f94a512ae0360a716fe3424df87f447a402