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

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