Merge "Fix 'date' so that it does not cause regeneration for unbundled builds"