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

Change-Id: I3797aef948bdb271a96acb4026ccf906cf5e8aa5