Merge "Update bug_map to explicitly have the b/ prefix"