Merge "Use interfaceDescriptor instead of interfaceChain" am: 7e5199f5dd am: d14a3dc170
am: 029dfa7805

Change-Id: I02f1e519abe8f6922954a8653fab237516d45d3e