Format dates with more than 4 digit years

Change-Id: Ic8e31cf4098b3d80fac46e0a8d84dfe7a8ca0e4c
Merge "Format dates with more than 4 digit years"