am e357469b: Merge "Fix a couple of minor publicly-reported GC bugs."

* commit 'e357469bb299559addb2bdadba27ac10a763e88d':
  Fix a couple of minor publicly-reported GC bugs.