Merge "Update EAT code for cppbor Map changes."