Merge "use directory timestamp during OTA" into nyc-mr1-dev