Merge "Revert "Revert "Add compatibility metadata to OTA package""" am: f9937b5c24 am: 5e15d3cce1 am: 925147dd7d
am: b398d18f94

Change-Id: I537cebcb1992bce95a88d09f03926d75bfbf2ce1