Merge "fix timestamps in images to the build date"