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