Fix iso8601 version

Change-Id: I3f5cb9fea554fc0ac62d18251dfb236b4c0e26f6