Merge "Fix local tests that were failing on eng builds because of Log.wtf" into main