Merge "Revert "Add compatibility metadata to OTA package"" into oc-dev am: 533183dc68
am: f6d073e487

Change-Id: I4430c718481510cdb268e5a9fbe875bb5f095826