Merge "Remove unnecessary std::move from variant_map.h"