am 6897b7b8: Merge "Fix for linker allocator"

* commit '6897b7b8b95beae120fd53e6fd15921d6420bea7':
  Fix for linker allocator