Merge "Modernise code to use std::make_unique" am: 4ed4815951
am: d8a94a48a8

Change-Id: Ifd8675234b82d3cf71be87be5b83e4a0e455ea9d