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

Change-Id: I6616e79565ff3cda71199d6055ee77140fe30fdb