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