Add back anfog_dm_trajectory_map and anfog_rt_trajectory_data to keep consistent with branch master