Merge "Copy preopted files from B partition." into nyc-mr1-dev