am 2dc3c739: am ff5cbab5: Merge "Ensures that CompatibilityInfo is always set...
am 2dc3c739: am ff5cbab5: Merge "Ensures that CompatibilityInfo is always set in Resources" into klp-dev
* commit '2dc3c739':
Ensures that CompatibilityInfo is always set in Resources