am 66f5affb: Merge "Fix bug number for linker related workarounds"

* commit '66f5affbe41a49bedf35e73b7c7f482db6e2fa7b':
  Fix bug number for linker related workarounds