Refactor space bitmap to be a value object am: 6f38201339
am: 8005ba6072

Change-Id: If2509b18ae5ebad3de30e00c791c95f79d69c000