Merge "Show bug_map links on user builds" am: c5f8b3925b am: 92f544dedb am: a7f7c3f702
am: 0084887a11

Change-Id: I2647ed00a9ad9d68e3dfe0b5f05d3587dc1e67dc