Merge "More armv8/optimizing test failures."