am 9f64567d: Merge changes Icb667451,Ie08d910b

* commit '9f64567d9f5e7c7db3b62869a1c199f4ff7d3691':
  Use template instead of macro to release UniquePtrs.
  Make usage of new/delete and malloc/free consistent.