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

Change-Id: I09607372a38cc9cd17268473d51c26f09e71e127