Merge "Last patch for running tests on ARM64"