Merge "Add lint support for fallback configurations"