Merge "Add compatibility metadata to OTA package" into oc-dev
am: 5a933fc8d5

Change-Id: I69efaa4a920ddf13bbdd0de98dbabc0075480b3b