Merge "Extract separate INTENT_OWNERS"