Merge "Compatibility layer to transition from UniquePtr to std::unique_ptr."