Merge "Moving bug_map entry from wahoo specific to global policy"