Merge "NotValidDataException.java-junits"