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

Change-Id: I7a34ff0d9a98612e9a9ecb9468a7c91837e4bba1