Merge "DO NOT MERGE Revert "Revert "releasetools: Support OTAs that have OEM...
Merge "DO NOT MERGE Revert "Revert "releasetools: Support OTAs that have OEM properties changes.""" into cw-f-dev am: fccf4ec0
am: a1980abe -s ours
Change-Id: I8558172a3171d992073b34ed249e69d0f6ca33f3