am f0ed1f0f: Merge "Fix GC map generation edge case" into mnc-dev

* commit 'f0ed1f0fe2643c49997ea0e0bd04226ef7ba33fa':
  Fix GC map generation edge case