am b03d55aa: Merge "DO NOT MERGE: Only use a fixed timestamp when packaging." into mnc-dr-dev

* commit 'b03d55aaeb5962690631ed1a25d8e628667d8ad2':
  DO NOT MERGE: Only use a fixed timestamp when packaging.