Merge "Fix: full ota package larger than 2GB fails to upgrade"