Merge "Add compatibility metadata to OTA package" into oc-dev