Merge pull request #2957 from akoeplinger/fix-corlib-mobile-tests