Merge "boot_control_copy: switching to C++"