(such redundant std::unique_ptr copies could happen when changing parts of the
code base to make use of std::unique_ptr individually)

Change-Id: Ib48a45a212f9426a775c7f379bc5d3c92230218a