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

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