am 58c27e3e: am c0ce6c42: Merge "Reduce risk of memory corruption due to finalization."

* commit '58c27e3e53ef64072412515792433e570a176f15':
  Reduce risk of memory corruption due to finalization.