Merge "Disable persistence integration tests"