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

Change-Id: Ic0609c3f2bca10329c2daf8e2b0d4f0215313734