Merge "Refine erratum 843419 check for linker workaround."