Merge "Workaround for test failures after Bsymbolic fix." into lmp-dev