Merge "DO NOT MERGE Revert "Revert "releasetools: Support OTAs that have OEM properties changes.""" into cw-f-dev am: fccf4ec06e am: a1980abe1f  -s ours
am: 132566628b  -s ours

Change-Id: I75790b209f2b246deb1a71b70b07db4ab9a035df