Merge "[RESTRICT AUTOMERGE] SF: Disable flaky unit tests"