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