Merge "Use java.util.Date instead of java.sql.Date."