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

Change-Id: Ib7475ee0349093273987855ee63b712fd34367ed