Clean up date string to stand alone if needed

Change-Id: I9ab4e6eff8e92bba09011b2921cd85ecf42be685