Merge "Create /data/ota_package for OTA packages." into nyc-mr1-dev