Merge "Revert "Revert "Add compatibility metadata to OTA package"""