Merge "Return existing interfaces for repeated getExtension calls"