Remove Calendar dependency (#14668)

This can cause GWT compilation problems as java.util.Calendar is not
available in GWT

Change-Id: Ia13d8f433ac43fcfd670c8e05b1295d3c64327cf