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