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

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