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

* commit '8bed8749ea8b142f3653344b0c8a5de667165bbb':
  Fix bug number for linker related workarounds