Merge "Remove bug_map entry for incident"