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