Merge "Update bug_map to explicitly have the b/ prefix" am: af68bb3fa4 am: 2ac8ec391a
am: 0b2200046b

Change-Id: I14d5bf8d03735b964438036abadede862c436192