Refactoring out grid occupancy management in a separate class
am: ff4ba2d995

* commit 'ff4ba2d99593ed84963b3f71c555b529dd905835':
  Refactoring out grid occupancy management in a separate class

Change-Id: I1174958b1398fe702a463bc3ecb6ed36fcf477f8