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

Change-Id: I9c7c6e26269e866a596055be577ba73648ee85d0