Merge "Revert "Revert "releasetools: Support OTAs that have OEM properties changes."""