Merge "Use interfaceDescriptor instead of interfaceChain"