am ff5cbab5: Merge "Ensures that CompatibilityInfo is always set in Resources" into klp-dev

* commit 'ff5cbab50076baa06333b6ee05cc04c882a7ba13':
  Ensures that CompatibilityInfo is always set in Resources