am 91176f41: am bfa45cdd: Merge "Change reference processing to use heap references."

* commit '91176f412c6bafc7f92e2e9565e65897ee7fb108':
  Change reference processing to use heap references.