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

* commit 'b6f7dd330f115fc977d1d5a10122c41c9dd7c210':
  Remove unnecessary std::move from variant_map.h