Merge "Remove the java-synchronization and completely rely on DB transactions"