am 85fe589b: am 8edd574b: Merge "GSS: Fix the bump pointer space only collection."

* commit '85fe589b26e4e529a5dc64bd4f29014c52b8ae6f':
  GSS: Fix the bump pointer space only collection.