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

Change-Id: I2f48fcc33555c1516d5349f28ec300ef36ef941a