Merge "Use interfaceDescriptor instead of interfaceChain"
am: 7e5199f5dd

Change-Id: I1e3ba417e30e2736fe0f1a13c300da7d4e6ad4f6