am 126643e7: am 19315c12: Merge "Clean up GC callbacks to be virtual methods"

* commit '126643e7f2d7f104067abf0d3e120e163775a60b':
  Clean up GC callbacks to be virtual methods