am de95de7c: am 5d280a58: am 8bed8749: Merge "Fix bug number for linker related workarounds"

* commit 'de95de7cab46ad500ff6c8e3d5da98ba1379df92':
  Fix bug number for linker related workarounds