Build Scripts: Changes to make OTA compatiblity.