am 2124d7e1: Merge "Only use a fixed timestamp when packaging."

* commit '2124d7e1e2dec91ce4ab15c6a215d61f7693a8d6':
  Only use a fixed timestamp when packaging.