Merge "Remove fixed bug from bug_map."