Merge "419 fails on optimizing/arm64."