Merge "Use Jan 1 2009 as timestamp in OTA update ZIPs." into nyc-dev