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

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