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

Change-Id: Ie72ea8beaab990008ebb272ae2018c0a45ebcb25