am 389e3e08: am 380d24d9: Merge "Compatibility layer to transition from UniquePtr to std::unique_ptr."

* commit '389e3e087fd7a87ca767c62ed851b0031ebdf756':
  Compatibility layer to transition from UniquePtr to std::unique_ptr.