Merge "gatekeeperd: use std::unique_ptr" into oc-mr1-dev