Merge "dx: Revise interface method handling" am: cb7a2eef06 am: 742050e366
am: c449aea689

Change-Id: If1ab9a9dbe6293ce82d6c02529e3f194c5affdaf