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