Merge "Fix OTA scripts to generate incremental BBOTA with OEM property."