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

Change-Id: I81503075e9f185d5865e45306dc1c3358fc4b423