am d377c485: Merge "Fix bug number for linker related workarounds"

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