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

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