Merge "DuplicateRecordException.java-junits"