Merge "Use interfaceDescriptor instead of interfaceChain"
am: 225688af7c

Change-Id: I6e9dd30843c4638a391c2bac1eaa9eb332f44ec9